Make files & tree expanders

diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old
index 2d49d0e797c25593b5818c1f6455180697c76df6..359de5e781348b562d76f38b7c1781859a5c09c9 100755 (executable)
--- a/modules/engines/ms-windows/ChangeLog.old
+++ b/modules/engines/ms-windows/ChangeLog.old
@@ -1,3 +1,10 @@
+2003-08-20  Raymond Penners <raymond@dotsphinx.com>\r
+\r
+       * */Makefile.msc: Provided MS-VC++ make files.\r
+       \r
+       * src/xp_theme.c: The open/close tree expander symbols were\r
+       accidentally switched. Fixed.\r
+\r
 2003-08-11  Raymond Penners <raymond@dotsphinx.com>\r
 \r
        * src/wimp_style.c: The menu background color now follows XP's\r

diff --git a/modules/engines/ms-windows/Makefile.msc b/modules/engines/ms-windows/Makefile.msc
new file mode 100755 (executable)
index 0000000..11098be
--- /dev/null
+++ b/modules/engines/ms-windows/Makefile.msc
@@ -0,0 +1,71 @@
+# Makefile.msc -- Makefile for MS-VC++ (-*- makefile -*-)
+#
+# Copyright (C) 2003 Raymond Penners <raymond@dotsphinx.com>
+#
+# $Id$
+
+!INCLUDE ../Makefile.msc.config
+
+##
+# Target
+TARGET=libwimp.dll
+
+OBJS = \
+       wimp_style.obj \
+       wimp_theme_main.obj \
+       wimp_rc_style.obj \
+       xp_theme.obj
+
+##
+# GTK
+#
+GTK_CFLAGS=\
+       -I$(GTK_DIR)/include/gtk-2.0 \
+       -I$(GTK_DIR)/lib/gtk-2.0/include \
+       -I$(GTK_DIR)/include/atk-1.0 \
+       -I$(GTK_DIR)/include/pango-1.0 \
+       -I$(GTK_DIR)/include/glib-2.0 \
+       -I$(GTK_DIR)/lib/glib-2.0/include
+
+GTK_LDFLAGS=/libpath:$(GTK_DIR)/lib
+
+GTK_LIBS= \
+       gtk-win32-2.0.lib \
+       gdk-win32-2.0.lib \
+       atk-1.0.lib \
+       gdk_pixbuf-2.0.lib \
+       pangowin32-1.0.lib \
+       pango-1.0.lib \
+       gobject-2.0.lib \
+       gmodule-2.0.lib \
+       glib-2.0.lib \
+       intl.lib \
+       iconv.lib
+
+##
+# WIN32
+#
+WIN32_LIBS = \
+       gdi32.lib \
+       user32.lib
+
+WIN32_CFLAGS=-I"$(SDK_DIR)"
+WIN32_LDFLAGS=/DLL /SUBSYSTEM:WINDOWS
+
+##
+# Target
+#
+LIBS=$(GTK_LIBS) $(WIN32_LIBS)
+CFLAGS=$(WIN32_CFLAGS) $(GTK_CFLAGS)
+LDFLAGS= $(WIN32_LDFLAGS) $(GTK_LDFLAGS) 
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+       link $(LDFLAGS) $(LIBS) /OUT:$@ $(OBJS)
+
+install: $(TARGET)
+       copy libwimp.dll "$(INSTALL_DIR)"
+
+clean:
+       del *.obj *.dll *.exp *.lib

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 4f7c1fd06750c8b74ccf25eb9f3bef6fd785f37b..645eb8781f49b2ba6f8572d1b96d0381b2d99bbb 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -448,11 +448,11 @@ xp_theme_map_gtk_state(XpThemeElement element, GtkStateType state)
       break;\r
 \r
     case XP_THEME_ELEMENT_TREEVIEW_EXPANDER_OPENED:\r
-      ret = GLPS_CLOSED;\r
+      ret = GLPS_OPENED;\r
       break;\r
 \r
     case XP_THEME_ELEMENT_TREEVIEW_EXPANDER_CLOSED:\r
-      ret = GLPS_OPENED;\r
+      ret = GLPS_CLOSED;\r
       break;\r
 \r
     case XP_THEME_ELEMENT_PROGRESS_BAR_H:\r